aceca328532c199e647cb894549656224aece4f1,backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterSyncJob.java,GlusterSyncJob,removeDeletedOptions,#GlusterVolumeEntity#Collection#,735
Before Change
// The option "group" gets implicitly replaced with a set of options defined in the group file
// Hence it is not required to log it as a removed option, as that would be misleading.
if (!GlusterConstants.OPTION_GROUP.equals(existingOption.getKey())) {
logUtil.logAuditMessage(fetchedVolume.getClusterId(), fetchedVolume, null,
AuditLogType.GLUSTER_VOLUME_OPTION_RESET_FROM_CLI,
new HashMap<String, String>() {
{
put(GlusterConstants.OPTION_KEY, existingOption.getKey());
put(GlusterConstants.OPTION_VALUE, existingOption.getValue());
}
});
}
}
}
After Change
}
@SuppressWarnings("serial")
private void removeDeletedOptions(GlusterVolumeEntity fetchedVolume,
Collection<GlusterVolumeOptionEntity> existingOptions) {
List<Guid> idsToRemove = new ArrayList<>();
for (final GlusterVolumeOptionEntity existingOption : existingOptions) {
if (fetchedVolume.getOption(existingOption.getKey()) == null) {
idsToRemove.add(existingOption.getId());
log.info("Detected option '{}' reset on volume '{}'. Removing it from engine DB as well.",
existingOption.getKey(),
fetchedVolume.getName());
// The option "group" gets implicitly replaced with a set of options defined in the group file
// Hence it is not required to log it as a removed option, as that would be misleading.
if (!GlusterConstants.OPTION_GROUP.equals(existingOption.getKey())) {
Map<String, String> customValues = new HashMap<>();
customValues.put(GlusterConstants.OPTION_KEY, existingOption.getKey());
customValues.put(GlusterConstants.OPTION_VALUE, existingOption.getValue());
logUtil.logAuditMessage(fetchedVolume.getClusterId(), fetchedVolume, null,
AuditLogType.GLUSTER_VOLUME_OPTION_RESET_FROM_CLI, customValues);
}
}
}